Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Mon, 30 Jan 2006 11:56:14 +0000 (12:56 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Mon, 30 Jan 2006 11:56:14 +0000 (12:56 +0100)
commit6eef90569086543fa68497231c5c0f55ce9987ea
tree7248be2c50b9d6f421403c9434685adae038c8dc
parent397573a0c6716e3290344936588597df083cc3c4
parent91fe82d9a0d03a5c28bf3a47f4a20c21002cbcb1
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk